From 7175a2e99c80a771628f2c46b318a6b01c7de221 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 3 Nov 2003 22:13:24 +0000 Subject: [PATCH] Some leftover cleanups. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkuimanager.c | 8 +++----- 6 files changed, 33 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c82a40a08..d6367217d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Nov 3 23:12:41 2003 Matthias Clasen + + * gtk/gtkuimanager.c (_gtk_menu_is_empty): Return TRUE if + menu is NULL. + (update_smart_separators): Remove some unneeded ifs. + Mon Nov 3 22:45:58 2003 Matthias Clasen * gtk/gtkwindow-decorate.h: Add G_BEGIN_DECLS/G_END_DECLS to make diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2c82a40a08..d6367217d5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Nov 3 23:12:41 2003 Matthias Clasen + + * gtk/gtkuimanager.c (_gtk_menu_is_empty): Return TRUE if + menu is NULL. + (update_smart_separators): Remove some unneeded ifs. + Mon Nov 3 22:45:58 2003 Matthias Clasen * gtk/gtkwindow-decorate.h: Add G_BEGIN_DECLS/G_END_DECLS to make diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2c82a40a08..d6367217d5 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Nov 3 23:12:41 2003 Matthias Clasen + + * gtk/gtkuimanager.c (_gtk_menu_is_empty): Return TRUE if + menu is NULL. + (update_smart_separators): Remove some unneeded ifs. + Mon Nov 3 22:45:58 2003 Matthias Clasen * gtk/gtkwindow-decorate.h: Add G_BEGIN_DECLS/G_END_DECLS to make diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2c82a40a08..d6367217d5 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Nov 3 23:12:41 2003 Matthias Clasen + + * gtk/gtkuimanager.c (_gtk_menu_is_empty): Return TRUE if + menu is NULL. + (update_smart_separators): Remove some unneeded ifs. + Mon Nov 3 22:45:58 2003 Matthias Clasen * gtk/gtkwindow-decorate.h: Add G_BEGIN_DECLS/G_END_DECLS to make diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2c82a40a08..d6367217d5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Nov 3 23:12:41 2003 Matthias Clasen + + * gtk/gtkuimanager.c (_gtk_menu_is_empty): Return TRUE if + menu is NULL. + (update_smart_separators): Remove some unneeded ifs. + Mon Nov 3 22:45:58 2003 Matthias Clasen * gtk/gtkwindow-decorate.h: Add G_BEGIN_DECLS/G_END_DECLS to make diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 0d9ec632cb..048b851269 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -1662,7 +1662,7 @@ _gtk_menu_is_empty (GtkWidget *menu) g_return_val_if_fail (menu == NULL || GTK_IS_MENU (menu), TRUE); if (!menu) - return FALSE; + return TRUE; children = gtk_container_get_children (GTK_CONTAINER (menu)); @@ -1772,10 +1772,8 @@ update_smart_separators (GtkWidget *proxy) GtkWidget *item; item = gtk_menu_get_attach_widget (GTK_MENU (parent)); - if (GTK_IS_MENU_ITEM (item)) - _gtk_action_sync_menu_visible (NULL, item, empty); - if (GTK_IS_WIDGET (filler)) - g_object_set (G_OBJECT (filler), "visible", empty, NULL); + _gtk_action_sync_menu_visible (NULL, item, empty); + g_object_set (G_OBJECT (filler), "visible", empty, NULL); } } } -- 2.30.2